:get_property): remove g_value_init calls, as they are no longer needed.

2000-12-20  Jonathan Blandford  <jrb@redhat.com>

	    * gtk/gtkcellrenderer*.c (::get_property): remove
              g_value_init
	      calls, as they are no longer needed.

	      * gtk/gtktreemodelsort.c: Fix up the comparison code.

	      * gtk/gtktreemodel.h: Start work on ::reordered signal.
	      Need to
	      figure out how to emit a signal on an interface.

diff --git a/ChangeLog b/ChangeLog
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index efef8e92967ce8d97e5794fc415c22f059a388a8..8573b4e9e8591c900914c0da9c3c0fdff712633f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2000-12-20  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkcellrenderer*.c (::get_property): remove g_value_init
+       calls, as they are no longer needed.
+
+       * gtk/gtktreemodelsort.c: Fix up the comparison code.
+       
+       * gtk/gtktreemodel.h: Start work on ::reordered signal.  Need to
+       figure out how to emit a signal on an interface.
+
 2000-12-20  Havoc Pennington  <hp@redhat.com>
 
        * tests: new directory to contain tests, gtk/test* should move

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 4a4a0bc63980d2a98b4d5102199c835b72c7539f..4e1b9f58a06c5c77cc1796523b394fd0e98e613a 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -121,7 +121,6 @@ gtk_cell_renderer_pixbuf_get_property (GObject        *object,
   switch (param_id)
     {
     case PROP_PIXBUF:
-      g_value_init (value, G_TYPE_OBJECT);
       g_value_set_object (value, G_OBJECT (cellpixbuf->pixbuf));
       break;
     default:

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 60f3ed9bcad63082cf28dceb17b6be3e11b5af37..f9f81ba3a84ad69da29f0ffd9db0dfdc1ebd27e9 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -205,22 +205,18 @@ gtk_cell_renderer_text_get_property (GObject        *object,
   switch (param_id)
     {
     case PROP_TEXT:
-      g_value_init (value, G_TYPE_STRING);
       g_value_set_string (value, celltext->text);
       break;
     case PROP_STRIKETHROUGH:
-      g_value_init (value, G_TYPE_BOOLEAN);
       attr_iter = pango_attr_list_get_iterator (celltext->attr_list);
       attr = pango_attr_iterator_get (attr_iter,
                                      PANGO_ATTR_STRIKETHROUGH);
       g_value_set_boolean (value, ((PangoAttrInt*) attr)->value);
       break;
     case PROP_UNDERLINE:
-      g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, celltext->underline);
       break;
     case PROP_EDITABLE:
-      g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, celltext->editable);
       break;
     default:

diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
index c17a1170e8de2d83480270b1c202c34791dbf3d6..fac044d657b1dceff61eb415cde20a74a45f06cf 100644 (file)
--- a/gtk/gtkcellrenderertoggle.c
+++ b/gtk/gtkcellrenderertoggle.c
@@ -164,11 +164,9 @@ gtk_cell_renderer_toggle_get_property (GObject     *object,
   switch (param_id)
     {
     case PROP_STATE:
-      g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, celltoggle->state);
       break;
     case PROP_RADIO:
-      g_value_init (value, G_TYPE_BOOLEAN);
       g_value_set_boolean (value, celltoggle->radio);
       break;
     default:

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 9357f6a793c9e8cfd3146f16cf1026f5fc655e1f..1b71a004cf40da7b2304e2b501d55e14100a2dfe 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -40,6 +40,12 @@ gtk_tree_model_get_type (void)
         sizeof (GtkTreeModelIface), /* class_size */
        NULL,           /* base_init */
        NULL,           /* base_finalize */
+       NULL,
+       NULL,           /* class_finalize */
+       NULL,           /* class_data */
+       0,
+       0,              /* n_preallocs */
+       NULL
       };
 
       tree_model_type = g_type_register_static (G_TYPE_INTERFACE, "GtkTreeModel", &tree_model_info, 0);

diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index ec5ba2b28c279b06198b882ceed73b0494c6124e..09495d1ec78766b1fe2079e4fff87256c9770acb 100644 (file)
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -71,6 +71,9 @@ struct _GtkTreeModelIface
                                      GtkTreeIter  *iter);
   void         (* deleted)           (GtkTreeModel *tree_model,
                                      GtkTreePath  *path);
+  void         (* reordered)         (GtkTreeModel *tree_model,
+                                     GtkTreePath  *path,
+                                     gint         *new_order);
 
   /* VTable - not signals */
   guint        (* get_flags)       (GtkTreeModel *tree_model);   

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 1972c628ccbe0df928d4cd6387d0ee0a4e0fd62e..617aa48fb2cb8b08a1fa1109afc8ecce8fcac862 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -419,10 +419,7 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *sort,
   GtkTreeIter iter;
   SortElt elt;
   gint offset;
-  gint middle, j;
-  GValueCompareFunc func;
-  GValue s_value = {0, };
-  GValue tmp_value = {0, };
+  gint j;
   SortElt *tmp_elt;
   offset = gtk_tree_path_get_indices (s_path)[gtk_tree_path_get_depth (s_path) - 1];
 
@@ -466,8 +463,6 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *sort,
 
   g_array_insert_vals (array, index, &elt, 1);
 
-  g_value_unset (&s_value);
-
   /* update all the larger offsets */
   tmp_elt = (SortElt *) array->data;
   for (j = 0; j < array->len; j++, tmp_elt++)
@@ -1104,8 +1099,8 @@ gtk_tree_model_sort_func  (gconstpointer a,
                           gconstpointer b,
                           gpointer      user_data)
 {
-  GValue value_a;
-  GValue value_b;
+  GValue value_a = {0, };
+  GValue value_b = {0, };
   SortData *sort_data = user_data;
   gint retval;
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b837654575de4bd8d0335070bd974761f3d5aa0a..fbb23e53e320b3d5f1cb6683d0148efbecd39b02 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -946,7 +946,7 @@ gtk_tree_view_motion (GtkWidget *widget,
          gtk_tree_view_column_set_size (gtk_tree_view_get_column (GTK_TREE_VIEW (widget), tree_view->priv->drag_pos), new_width);
        }
 
-      /* FIXME: We need to scroll */
+      /* FIXME: Do we need to scroll */
       _gtk_tree_view_set_size (GTK_TREE_VIEW (widget), -1, tree_view->priv->height);
       return FALSE;
     }
@@ -1437,7 +1437,7 @@ gtk_tree_view_focus_out (GtkWidget     *widget,
 }
 
 /* FIXME: It would be neat to someday make the headers a seperate widget that
- * can be shared between various apps
+ * can be shared between various apps.  Wishful thinking, though...
  */
 /* Returns TRUE if the focus is within the headers, after the focus operation is
  * done

diff --git a/gtk/treestoretest.c b/gtk/treestoretest.c
index 2aa1c3484d63f240d66e48363a17f50511981a7b..0601922ec234205beada92be23d6b90d5264554d 100644 (file)
--- a/gtk/treestoretest.c
+++ b/gtk/treestoretest.c
@@ -18,14 +18,18 @@ static void
 node_set (GtkTreeIter *iter)
 {
   static gint i = 0;
-
+  gint n;
   gchar *str;
 
-  str = g_strdup_printf ("FOO: %d", i++);
+  str = g_strdup_printf ("Row (%d)", i++);
   gtk_tree_store_set (base_model, iter, 0, str, -1);
   g_free (str);
 
-  str = g_strdup_printf ("%d", g_random_int ());
+  n = g_random_int ();
+  if (n < 0)
+    n *= -1;
+  str = g_strdup_printf ("%d", n);
+
   gtk_tree_store_set (base_model, iter, 1, str, -1);
   g_free (str);
 }
@@ -133,7 +137,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view)
          gtk_tree_store_insert_after (model,
                                       &iter,
                                       NULL,
-                                      &selected);
+                                      NULL);
          node_set (&iter);
        }
     }
@@ -303,12 +307,12 @@ make_window (gboolean use_sort)
   /* A few to start */
   if (!use_sort)
     {
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
     }
   /* Show it all */
   gtk_widget_show_all (window);

diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 2aa1c3484d63f240d66e48363a17f50511981a7b..0601922ec234205beada92be23d6b90d5264554d 100644 (file)
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -18,14 +18,18 @@ static void
 node_set (GtkTreeIter *iter)
 {
   static gint i = 0;
-
+  gint n;
   gchar *str;
 
-  str = g_strdup_printf ("FOO: %d", i++);
+  str = g_strdup_printf ("Row (%d)", i++);
   gtk_tree_store_set (base_model, iter, 0, str, -1);
   g_free (str);
 
-  str = g_strdup_printf ("%d", g_random_int ());
+  n = g_random_int ();
+  if (n < 0)
+    n *= -1;
+  str = g_strdup_printf ("%d", n);
+
   gtk_tree_store_set (base_model, iter, 1, str, -1);
   g_free (str);
 }
@@ -133,7 +137,7 @@ iter_insert_after (GtkWidget *button, GtkTreeView *tree_view)
          gtk_tree_store_insert_after (model,
                                       &iter,
                                       NULL,
-                                      &selected);
+                                      NULL);
          node_set (&iter);
        }
     }
@@ -303,12 +307,12 @@ make_window (gboolean use_sort)
   /* A few to start */
   if (!use_sort)
     {
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
-      iter_prepend (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      iter_append (NULL, GTK_TREE_VIEW (tree_view));
     }
   /* Show it all */
   gtk_widget_show_all (window);